Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Sep 24, 2024

This is a selection of fixes:

Using `rabbitmq.com` works and redirects to `www.rabbitmq.com`, but it
is preferable to use the canonical domain to have cleaner search
results.

This is important for manpages because we have an HTML copy in the
website.

(cherry picked from commit e7784df)
(cherry picked from commit eb74e21)
@mergify mergify bot added the conflicts label Sep 24, 2024
@mergify
Copy link
Author

mergify bot commented Sep 24, 2024

Cherry-pick of 0c9f9ab has failed:

On branch mergify/bp/v3.13.x/pr-12363
Your branch is ahead of 'origin/v3.13.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0c9f9abd4b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbit/BUILD.bazel
	modified:   deps/rabbit/INSTALL
	modified:   deps/rabbit/Makefile
	modified:   deps/rabbit/README.md
	modified:   deps/rabbit/SECURITY.md
	modified:   deps/rabbit/docs/README-for-packages
	modified:   deps/rabbit/docs/advanced.config.example
	modified:   deps/rabbit/docs/rabbitmq-diagnostics.8
	modified:   deps/rabbit/docs/rabbitmq-plugins.8
	modified:   deps/rabbit/docs/rabbitmq-queues.8
	modified:   deps/rabbit/docs/rabbitmq-server.8
	modified:   deps/rabbit/docs/rabbitmq-server.service.example
	modified:   deps/rabbit/docs/rabbitmq-service.8
	modified:   deps/rabbit/docs/rabbitmq-streams.8
	modified:   deps/rabbit/docs/rabbitmq-upgrade.8
	modified:   deps/rabbit/docs/rabbitmq.conf.example
	modified:   deps/rabbit/docs/rabbitmqctl.8
	modified:   deps/rabbit/priv/schema/rabbit.schema
	modified:   deps/rabbit/src/rabbit_core_ff.erl
	modified:   deps/rabbit/src/rabbit_health_check.erl
	modified:   deps/rabbit/src/rabbit_ssl.erl
	modified:   deps/rabbit/test/dead_lettering_SUITE.erl
	modified:   deps/rabbit/test/policy_SUITE.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deps/rabbit/test/amqp_client_SUITE.erl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@dumbbell dumbbell self-assigned this Sep 24, 2024
They changed with the switch to Docusaurus. This avoids a redirect and
gives cleaner search results.

(cherry picked from commit 89fc33a)
(cherry picked from commit 0c9f9ab)
(cherry picked from commit fe10cd8)
(cherry picked from commit 78c6a90)
[Why]
Classic queue mirroring was removed from RabbitMQ 4.0.x.

(cherry picked from commit 5158460)
(cherry picked from commit a89a627)
@dumbbell dumbbell force-pushed the mergify/bp/v3.13.x/pr-12363 branch from a351da2 to e710f29 Compare September 24, 2024 09:45
@dumbbell dumbbell merged commit 5ab9060 into v3.13.x Sep 24, 2024
225 checks passed
@dumbbell dumbbell deleted the mergify/bp/v3.13.x/pr-12363 branch September 24, 2024 11:18
@dumbbell dumbbell added this to the 3.13.8 milestone Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants